am: 4edfc035 Change-Id: I5f0a32ca9786c0d65de5f779f4c3f95637400d0f
mentioned in commit 93c6200d
mentioned in commit 276f3086