Test: this Bug: 139268426 Change-Id: I6d30ac0193225826a97ff3853a98b939e571d074 Merged-In: Idefce1174b82668d23c53dd1bf95bc660cb21c28 (cherry picked from commit 7922d354307e4a41a336c29291285550a94da434, aosp/1284560)