Merge changes I76cb1ea5,Ia7e02c34
am: 3646dfebf6

Change-Id: I9eefe31a8aa887f6900d0eae6866f1f0fe81520c