Merge changes I4d6da40d,I91c7ced5,I7b9f6d18
am: 2fa9770c3a

Change-Id: I945e8858089139b77986efe3400da7825690d3f7