Merge changes I1b74d58b,I38c6e8bc
am: 9f41107732

Change-Id: Ib1a09ccb5773c4f6c01ad1d39b43c6f85f16092d