Merge e728eb482ca385ccb1b4552dc7e0fbf1873330e8 on remote branch

Change-Id: I21dbecb5e86a32b1227a649a223210bb8a1751a5