Merge commit 'b8d4d7dba310701d2d7c6785cad2c5cc6ab4387d' into b77882292

Change-Id: I4da5aa8b46909067fdbd012cd70071e1bb3e5f02