Merge 716c014a4e37dd2bf14f3d28879fef857ddcc3c4 on remote branch

Change-Id: Ife154b2cd96e24a4db675f0a6a6fb17fc7f1c1bf