fb0db2652a
Bug: 187861723 Test: rebuild Change-Id: I3a8c9e00f164d0f0dd381b188ecfd0c4a758a277 Merged-In: I3a8c9e00f164d0f0dd381b188ecfd0c4a758a277 (cherry picked from commit d56251bae4a305f5668adce8bfbfa1b31b8dc5e3)