Merge "DO NOT MERGE: Initialize layoutlib variables before using them" into mnc-ub-dev
am: f2af68312b  -s ours

* commit 'f2af68312bdcbb19411df21553d514c6aa1989bf':
  DO NOT MERGE: Initialize layoutlib variables before using them