Do this by backporting the change that is already in frameworks in commit 77085ff4. Did not use cherry pick because the testfile was moved in frameworks. BUG: 364355