Reconciliate differences in code order wrt AOSP master. DO NOT MERGE am: 6bc1bfa5b8

Change-Id: Idb69b803040a639c23c7d521ea8e6feb4d356987