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

Bug: 120502534
Change-Id: I92f34fead54f3f4e7490c89784cc67d1b20e80c2