This reverts commit 701fc35b. Reason for revert: annotation order is affected by configuration for some reason! Change-Id: Ice1406ff41b704915f981d8d379ced9d0793a822 Test: revert