Merge "Merge "Merge "Make mExpandImmediate false when collapsing" into udc-dev...
Merge "Merge "Merge "Make mExpandImmediate false when collapsing" into udc-dev am: f3825fa7 am: 93a9ece9" into udc-d1-dev-plus-aosp am: a04a4cd6" into udc-qpr-dev-plus-aosp