Merge c3b9e6e8942ef3e11fa780500e1238270884da89 on remote branch

Change-Id: Idbabc380205968214838cd5b9bdda0dd65efe325