Merge changes I119cf83a,Icc5a1e38,If07a04d3
am: 61e3189ec7

Change-Id: I2ef7c49b23314a5cb94671bba0d3891b6b7c3920