Merge f0fd8f3ffff80d95890fbb36b0597f5246c59e6b on remote branch

Change-Id: I7500447eeb3128678bb572e530d8d4ae41ed2f1a