Merge changes I86bc206d,If20a34e7,I6ee6c826,I240341a0
am: 47b6bdb2a0

Change-Id: I187f26238f479fba80890127db4ab113e5a29f47