Bug: 163024455 Change-Id: Ia0710c3462f03a85bc22aaac7b190961da1f8be3 Merged-in: I9c1737647d762f478c0e452e5b72f98ec3d43c28 (cherry picked from commit 29154b17)