am: 613a112d Change-Id: Ibe14553fd718d2da471b07bb39567d0d412343c5
mentioned in commit 8c10380c
mentioned in commit a2fff667