Merge "Respect parent bounds if it can contain the override bounds" into...
Merge "Respect parent bounds if it can contain the override bounds" into rvc-dev am: 0e42093c am: 51616c52 am: b01ab33e am: 103bd342 am: 0646f80f
Change-Id: I77d17079d6c9173aaa5df1a918824d616a3b176a