Merge changes I1bdeffc6,I3e13db97 am: 568220e911 am: 931d82739b
am: 3ba6c08658

Change-Id: I88f16a64a1f2eec29a996ef063c07ce4f11f959f