Merge ed053b45fcd9ab083c3ef259a3a72e849961f92b on remote branch

Change-Id: Ie3e74620e1283928d8be869867837a53516e1487