Merge changes Ia023cd7c,Ie4c968cb
am: 70f98d3997

Change-Id: Ia39ddc7460f1e0eca69d9afa864eb6de44051b15