Merge changes I1c9fd942,Ib1b4baee
am: f068a1d55d

Change-Id: If97f5df8e43eff7d6a7b8dd9d19758d38bde8e0c