Bug: 117991062 Test: Manual tested with an emulator Change-Id: Ic80a302afc2327ecad048537af8ca5b7d5329f72