Merge changes I2e8c2ad9,Ic4f4c7d2 am: 0c089bcc82
am: 9b86ed3c65

Change-Id: I068d2eb07d57779dda4d7b9e5bcd94e0ee8dc686