Merge branch 'fix-cmake-check-macro-usage' into release

Change-Id: Ie9ce317601e90415ca55701be66ca8d54f81d39f
Merge branch 'release'

Change-Id: I74fb42253bbddf2389e775e943413707f7b13964