Merge 5e8065efa13b0cdfba0478a207f2559bce11cf92 on remote branch

Change-Id: Ib6fd19304a4968ff3f1ae2731c9910acb67cf366