Bug: 194982368 Test: manual test Change-Id: I912e8d21d19be0a82d7f3b3f8398808f335b42de Merged-In: I912e8d21d19be0a82d7f3b3f8398808f335b42de (cherry picked from commit 52829859)