Merge changes I0fd0efd3,I7ba1fba5
am: 09e07ef275

Change-Id: Id3bd0f0b32f3aafe05ede8eac76b680d40960b72