am: 5acb77a5 Change-Id: If49038245142d0848d84229677150173d6ed159c
mentioned in commit f39f212d
mentioned in commit 6d9ea50a