Merge c45709212058e9123e3a53125a86a546926edc7b on remote branch

Change-Id: Ib0b4708f37aa6b8c8800369e3a9177dd557b3179