Merge changes I92fca312,I63152fc8,Ia65fb0c2
am: b2719c5f2d

Change-Id: I10052283f8f962d086c820a6481326041e04327a