Merge changes from topic \'bad-attr-buildfix\' into nyc-dev am: 7e91ec88ef
am: 8b0faef1a2

* commit '8b0faef1a2093e41965d175dc9781d92d57ef5f9':

Change-Id: I7238050eb1a0df58b8f1f715258e65f57d783849