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

Bug: 120502534
Change-Id: I84dcb58a1b379ccca6efdc69a0f6dcb6571da939