Merge changes I74d1f01c,I687b8694,Ie82e5cb9 am: 8b216baee2
am: ec88521be5

Change-Id: I6f013b89183cba4a2bc7c8c40dc6b01aea89e6da