Merge 0791f512348def6ac55153e6b6490d6e6b1e0e10 on remote branch

Change-Id: Ia1a464fd692bc90c4ecda4559e1fc80617c2bf49