Merge "DO NOT MERGE: Initialize layoutlib variables before using them" into...
Merge "DO NOT MERGE: Initialize layoutlib variables before using them" into mnc-ub-dev am: f2af6831 -s ours
am: c4f31dde
* commit 'c4f31dde':
DO NOT MERGE: Initialize layoutlib variables before using them