Merge changes I394f5782,I9475f5d0,I59707186
am: 61a4c2c69c

Change-Id: Ic1a62436b98f986e129a6b08d1ab939b70d5f3e6