Merge changes Id47b288d,I969565eb,Iba2e654e am: 365fdb7acb

Original change: undetermined

Change-Id: I5478564414c48ce0ab0c84ecd4a1e31eb3ec2eec