Merge "Merge pie-platform-release (PPRL.181105.017, history only) into master" am: 80647cf607
am: 4f75fa7703

Change-Id: I74d82c89ec212ccae1b66ec4063bf303870ea109