am d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev

* commit 'd38d3574d0b1905d41891c2d7f89892ab13803ae':
  Always force constructors accessible during inflation