Merge "Suppress new ignored-attributes warning"
am: 1b2d36db37

Change-Id: I4715d85505de1e77a38837e3ed72a8a8c534dd6e