Merge changes I84e4f878,I37b65eb9
am: bfc4f5e339

Change-Id: I2281b87887b0e5bb6e66d3a8446f84fdccd654dc