Merge changes I5041c541,I0eeafc99,Ie982d375
am: 30fcc9fc7f

Change-Id: If83104d4b621a6e29782f45f62d40d2899e480b5