Merge \\"Remove unnecessary ARRAY_SIZE macros.\\" am: c37d8ea22a
am: 7191a56e96

Change-Id: I75b427025da48d89f3503aa482967fc494354cc3