Merge changes I904d87c0,I9ef468a1 am: 85768e2dc3 am: 709c6fb8a9

Change-Id: I253587aca8cb272d0bf9576a84c5c7d5a0bb342a