Merge "Merge "Fix NPE on TaskFragment" into udc-dev am: b703d3e7 am: 329676f0" into udc-d1-dev-plus-aosp