Merge changes I7bb0b559,If147df2d,I25d7d590
am: 58ae8d4780

Change-Id: Ie48490358515dde0a9c3789bb4b2657ecfb6a093