Merge f03282a64cef4c06bd48570a518372748fe252c7 on remote branch

Change-Id: I250a66cd824966bd10c5a295c45be40a96881ffe