Merge commit 'c9a71e1' into import
am: 28a705d6a0

Change-Id: I61fb69523c80b9a8f420c30f781c66a4a76b58f6