Merge changes from topic \'bad-attr-buildfix\' into nyc-dev am: 7e91ec88ef am: 8b0faef1a2
am: 621c5064e0
* commit '621c5064e03b631c9bc2effeb264c26203f42624':
Change-Id: I413d8d7c9186161dcde3ed2a57781f53a09e8695
This commit is contained in: