Refs: #1470 Change-Id: I3d556cae90d31d81572b1c4e5c680e826577d428
* Merge 53e436ae7db1ed457692dbe16ccb15511aa6bc64 * Only arm64 stuff are left Change-Id: I6b79de1f659fa61e75f44811b639d41f9a37d6cc