Bug: 36140955 Bug: 35360169 Test: new unit test to ensure that all modules have this field Change-Id: Ie76e4306049eb56e7f4360f63093ab03b3ca2611 Merged-In: Id856f93c0d2a018be65bff33459b4b703d23257d
bug: 27747405 Change-Id: If08ec156678d5435c88d9f179d3bacd064493aff
Change-Id: Ida3141522a536a2d33bb366fdb6b00ced907c3a4