bug: 16727210 16076402 Change-Id: I0c3bf84e4588aa99c95592c26b6113d33808fe29 (cherry picked from commit c3baa190)