Merge changes I9d94e252,If4a543d3,I0af7cda9
am: 799f55fb01

Change-Id: I481ba55fa66de2482286ed5f5a9c4651a99cb273