am: d224e964 Change-Id: I084a7c031c215ce9a18dbcccff42fd9d64fb6e01 (cherry picked from commit 70c59234)