Merge 52f10f40605a2ffe85d25a43f9bd0c95e1b99dea on remote branch

Change-Id: Iab1f82901b6fd272178f15ed1c6ef3af5aa17476