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