Test: Verified passing locally Bug: 37465082 Change-Id: I325f940f83362174cbc63fc64a4aa57992ad85ac (cherry picked from commit 24da80f8)