Merge changes I53c2c560,I7d845ac5,I8b11d923 am: b4fda18d83
am: 3e4f309b68

Change-Id: I798b38aeb8a4997218797cb794192412802bd165