Merge changes I29c45a8b,I807439d8 am: 892b158af8
am: 18ac6293a5

Change-Id: I54b01e97da700e7e143f2f0da31285c162696290