Merge "Fix issues with wrong configuration being used to inflate layouts. Bug:...
Merge "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" into nyc-dev
am: d2a686fb
* commit 'd2a686fb':
Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406
Change-Id: Ia2e96a42b719a4dfe9bff8f59ae0b2a183170a45