DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

Bug: 120502534
Change-Id: I4f5395485e22b14bad698dbd8e291ce5adc21850