Bug: 30258412 Change-Id: I370a53ebad29ff0471e4b7776cd76b2530efe760 (cherry picked from commit 9739d48a)