Merge 30e6c31b9267e6a1f440d71a523ac73a6ec59379 on remote branch

Change-Id: Iec200be910eb3aef745b170829f5407600d82eda