am: 8cc927f2 Change-Id: I1c9b9b134fcd8e36ce045a57cfb818bd70ef22d7
mentioned in commit c626121c
mentioned in commit 584fe7a3