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
Change-Id: Icc084e2aaa467c0a9579523ca49679cd439bf349