Bug: 326057017 Test: atest Flag: EXEMPT bug fix Change-Id: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
b6fc7a6f58
fdd68f473b