Change-Id: I9c8bebf04cf0fa1a9cfd5211ea53c38bfb0affa7 Test: atest android.os.cts.BuildTest Bug: 155840001 Bug: 151157621