Merge changes I394f5782,I9475f5d0,I59707186 am: 44f6592b0d
am: b7f3707cd3

Change-Id: Id2899cce43a39d099797ce9915b3d924cae41e75