Test: this Bug: 139268426 Change-Id: I5d90fe2716032b7ebd2b425225fe8e96900fe63b Merged-In: I5edbff1d7eed2f939ba26f1ebd7ead49ac67b978 (cherry picked from commit 55d7923c1d75e3d91b79461e2bd3846abdd9eed2, aosp/1284569)