am: 45cd86d5 Change-Id: I0560490881cb8c6e8c8034b42496c53226d3b475
mentioned in commit 13625c78
mentioned in commit 0a8b34fb