Merge "Merge "Merge "Merge "Trace heap size for allocations" am: 9ffcfa5fad" into stage-aosp-master am: 65bd31aad3" into oc-dev-plus-aosp am: e5687e733f" into oc-dr1-dev-plus-aosp