Merge commit 'd0ad687fd77662b1442599b2997bd1a33ef0541c' into HEAD
Change-Id: I517757fd33c2a9355eaf6abfd038b2667a7603f7