Merge 15b320f57cefc1b78e6c69294e75a56f395e529a on remote branch

Change-Id: Ia84f63719b3870e4de6c6eda87af93a437daf767