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

Bug: 120502534
Change-Id: I0ab5735530d24f669cc43c961cf2118427b32a7b