(cherry picked from commit 835ba767d9e51ac6e509f55c1b54a1a6f4ade166) Change-Id: I243ce5f5687bd8b0e722cb766bda075ede6c2986
mentioned in commit db30abc0