am: 84c9163a -s ours Change-Id: Id4b9d1944bba9dd466f73e14427ad3199ede3726
mentioned in commit 21dfb501
mentioned in commit e7373863