Merge c0905aab9c18932ed6ebd080c908ede25b11a847 on remote branch

Change-Id: Ic5723f218d6105ef7090ea1696676afa41a7de54