Follow-up to 6659624b. Bug: 28187158 Change-Id: Ie81aff1cae1ff275faaaf4b858608e74b86d8622 (cherry picked from commit 8f4ade0f)