Merge changes I0f997d30,I288ba1f4 am: 53f8591789 am: bc3c6b1314
am: 755c78a8dd

Change-Id: If6773e2c3a09d9967f4767c0512e6746b6b44196