Merge 52ad4bbcd4e9cfa750831be20491fd2b391e5302 on remote branch

Change-Id: Iba01c20b0d36d9a61d8d656884e01ad275d05500