Merge changes I86076b07,I7409732e,I248b1b27 am: d773fbbb5c
am: 160741e742

Change-Id: I047d8d9f9170bb407d48085d4871262da6ee0fd4