Merge changes I4a49ddbc,Ied2bb7c8
am: 63999c39fe

Change-Id: Ie39a509502b8d3c43c39e0775fdc671932235db7