Merge "CDD: Requirements for Heavyweight app mode" into pi-dev
am: 41af3caac5

Change-Id: Id7ce9ee8ef2f00d397f16d8a0244c3a1a90992ad