Change-Id: Iec23903bc40c57d56232804b72ccc5ab7b8524d0 (cherry picked from commit 7d7e292b)
mentioned in commit 7ba78462
mentioned in commit 69e5b80a