Merge changes Iab38ef29,I85b66ab5 am: 5bb1721f6e

Change-Id: I76a4400b4bb378a1c3a37d6b028f43c2ce00c171