Merge "Address comments from #725016" am: 5ca3145db9 am: 50b0f7388b
am: 0d3e0e5aec

Change-Id: Ib008dce8a112b5b3cae07a58a8ce03e1d521278f