Merge 53a12258015bbd4b5bae4ed1dfb7d9b6c402f977 on remote branch

Change-Id: Idcb0cd9eac581041dcb83e132b18d2ef2158d025