Merge changes I92fca312,I63152fc8,Ia65fb0c2 am: b2719c5f2d
am: 888975673a

Change-Id: I00284fd4d1fb1507aefe3c7e41874b3c5a1ad55f