Just a shuffle to avoid a merge conflict Test: make Change-Id: Id68e4ef3b38965c08c9b783d32ccc2aca342ed24