Change-Id: I41a3cbf5c810668f9b0885f6614b2e48215901b2
* Tested ok on wiped Nexus * Tested ok on S3 * Upgrade verified on Nexus Change-Id: If5d4ce594f8a309cdb59589d10b1d33f3b79326c