Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: a27e14c240 am: ea6288bd2d

Change-Id: I97bd2471b04d9a6291b03a989ccd618c2dc70c6e