am: 9715862d Change-Id: I355325da814353cd9b7157c20a9f0cfc642c7daf
mentioned in commit 8dfd4508
mentioned in commit 40281204