cherry-picked from udc-qpr CL Bug: 303471576 Flag: no flag Test: none Change-Id: I0eefb229f0c9544b92d8e8db564129990ab7d65b