Merge changes Ic4bd706a,I680224ba
am: bad2bc1167

Change-Id: I4319c12527fd2c6ee2c4eaf21a547725d528184b