Merge 92a36955ebe5c467e64e759c1f6228d89b849e57 on remote branch

Change-Id: I77c727795c994dec9ed325ec5ff48a5b661b7720