Merge commit 'c9a71e1' into import am: 28a705d6a0
am: 4987f18a37

Change-Id: I2466b627ae0cfae95fd8cb0b82ddf2eb6a1b4779