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

Bug: 120502534
Change-Id: Ic060fc0959d95a05cef008104c252ebb5b343559