Merge changes I25e81a77,I95b8c142
am: 658f09ab75

Change-Id: Id7c2bf40a79bf26d9f2f4a552ec1ec8cda45def3