am: fbdaa4eb Change-Id: Ia6ff9f4b8e8cdd7d2035c2d8d6bc16e06b9cd58c
mentioned in commit 2682a8f6
mentioned in commit ac0a769d