Merge 83f1d4f914b415b020273460e848dc8017107764 on remote branch

Change-Id: I481ad30e38e5e4289dba6355367919161002b75d