Bug: 319669529 Merged-In: I8efef8efbc9f01e1177fbe3105513166ad90d22f Change-Id: If7ebdccc494c7edb5b1603eb3154ca508e14dc33
mentioned in commit 8e012089