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: 683f1228 am: eab7c029
Change-Id: Ie4b3b6526dc6b3b657e9eff02376d6f54cf798e3