Merge changes I321e12bf,If7e6e586,Ie145d1dd
am: 0c9c1fca6f

Change-Id: I287cfb4e5e0150c4690a2b988ff931d13a60d4de