Merge changes Ibec13fbe,If89c67c0
am: 27bf33e053

Change-Id: I661976aa6161d80aa23f47424828336cc7ca6ae6