Merge changes I6407c9b4,I49d9da67
am: 2ee17e6911

Change-Id: I5d9a9824ac26462d4a9a16bb5cb1a2c541ad8b34