Merge changes I14498bf3,I719fc648,Iaea9338a am: 19abd4d485 am: f61b11b6b5

Change-Id: I519ff82c03f4dafbe2908e20aecba6f43b65697f