Merge "CDD: Recommend A/B system update support" into nyc-mr1-dev
am: a16749c980

Change-Id: I07f1ff6e0322292e7d199d9c065968b30c02a845