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

Change-Id: Id3dc0b3a2d22f1092410756c868c0ca8662cbfa6