am: 24283c2f Change-Id: I0cf2d3ab87a063894eaf10130e23b5a9bb330916
mentioned in commit 49d8ad31
mentioned in commit 66261258