Merge "Add conditional on TARGET_BOARD_PLATFORM_VARIANT" into jb-mr1-aah-dev