Merge changes If53d3ee3,I7cc0eea1
am: 078a27af84

Change-Id: Ibbc60107e98978d285488f866289b9c1b7d30296