Merge "DO NOT MERGE Revert "Logging for catching memory issue in Parcel"" into oc-dev