Merge "Temporarily disable CorePlatformApi logging"
am: fd9e7b5d7e

Change-Id: I899faa3804b94675c442073f6a0ea0f73619a0c8