am: 5326d504 -s ours Change-Id: I78273c8427dece5a419c7fca245a0afc0f1ce71c
mentioned in commit b6d8f55c
mentioned in commit b182e798