Merge 047b332bc264848c116b42c2fc63db41307d26c0 on remote branch

Change-Id: I41541242efa8a6d3cafe4488187b58b3441cf8d9