Merge changes I8687ab9e,I61f879f2
am: 8a78f81a16

Change-Id: I47dc90733dbff86130404aa5291bc1621b018c89