Merge 04ce9f844025151e88527d320fa06239546a2553 on remote branch

Change-Id: I064dfd7d3d0a4b491f0e56fc29999ec4e5b45cb2