Merge 0be374c40a3c5fbebcf9827dcd53616ca0343225 on remote branch

Change-Id: I4fe728ca6a95f56f7329be46a7e89ade14d2189c