am: a90e2a2f Change-Id: I03a8e1285089021e48b885cc897f11efc0ef8275
mentioned in commit 71c6d11e
mentioned in commit 11398046