Merge changes I8a31ad3a,I8b385d51,I3fdcdc33,Ia4571cd3 am: bc4e9cb94e am: f9ba055853
am: 3fc9ed681c

Change-Id: I9437b272298b0b27bfd65b0c3cbb0abf0aa6be9c