Merge commit '5b3c00d998170d592192f8e77abd0804506a5bea' into HEAD
Change-Id: I21a7904482142cbf41b645ca490e3aef83eb262e