Merge cf4eac65570a43c797a00abb68779f4757426499 on remote branch

Change-Id: Iff2c3ea6b596957837341c392c435ddad03ef159