Merge 0da585feb98b3cfc8ee1171e96013bc013f80f57 on remote branch

Change-Id: I040c76371433d5dbebe5d00c60d35178779e9311