Test: Manual Bug: 191608501 Change-Id: I7656f78f47183e9e61d98a3ccbac94690570df20 Merged-In: I7656f78f47183e9e61d98a3ccbac94690570df20 (cherry picked from commit 760255d8)