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

Change-Id: I6324f15c9b54cdf9a8c9d44551f644f0b2687290