Merge 5a42e008c4230f7263281077a49b6a8347b6fab5 on remote branch

Change-Id: I3b8589a81480d30291091638f7cc4a35f2457ecb