Bug: 29404304 Change-Id: Ie5f079b00e62d0eda84923a75709f7c72a2af526 (cherry picked from commit 5a3b2f60)