Merge changes I2d6f80f0,I9c26852d am: c26ad188b7

Change-Id: I584138925bf090c1c4b600fc2327220d7e5e39c9