Merge changes I0ad349f2,I0f528cf1 am: 27a091d4a1
am: 69482cc127

Change-Id: I4871700c01aa89068992ccb04dd6cdfc152434ee