am: 046365e0 -s ours Change-Id: Ifb005e5d009b132dbd2fdba480ecca3407b699f7
mentioned in commit f63e6239
mentioned in commit ad2018a2