Merge bccf10a776a079111904db7c5d7d1700f1f5bd64 on remote branch

Change-Id: Idcab332117077be0e0547112db70a5b153947cbb