Merge to upstream r297772. am: b9e7f084bd
am: fabe890b75

Change-Id: I84b59f55a5e26cda1cb10d992f7ed0093c97df71