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

Bug: 120502534
Change-Id: I4565b7140600af3d2dcf3c58d6c2e707f6d216ef