Bug: 30204612 Change-Id: I02a325100ee7f24bcd87c6f77a0d9e8799bae9a3 (cherry picked from commit 9cd48bb4)