Merge changes I5041c541,I0eeafc99,Ie982d375 am: 30fcc9fc7f
am: 3967e136b2

Change-Id: I274dfc359667b0396bab2e00ac2f0868a920e7d9