am: 70cc106c Change-Id: I290d8e4d2aadfebc384ee937c396100003aba706
mentioned in commit 40e0ef28
mentioned in commit 865def90