Change-Id: I5827d39e178b169299512dd6a6259af13a42c4b1
mentioned in commit f39df891
mentioned in commit d92d7977