Test: builds, boots Bug: 67041047 Change-Id: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1 Merged-In: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1 (cherry picked from commit 0c686e78)