Merge commit 'd91da79' into import
am: f8b29e13fb

Change-Id: I0b8ca39e8b071f089819d8221e541f6f115528fd