Bug: 145207098,145206763,145206842 Test: CTS Change-Id: I0d07e0e6c4377eff5756ee938c5b43ad632249df (cherry picked from commit b6907622)