am: efc11dda Change-Id: I484e0c3641494e4390e02d2ee61270231a8bf9cd
mentioned in commit 70302690
mentioned in commit 1ea5ef90