Merge 292619a406e1209d62f1ea7de25593e0b11fe671 on remote branch

Change-Id: I869a4ad4411919bac52fcb6312a4ba0472af05e3