DO NOT MERGE Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I6fe2b888339a251d0cf073e028d227063bf5f70e