Sync the features/applications branch to the current version

Signed-off-by: David Diplock <ddiplock@qce.qualcomm.com>
Change-Id: Ibab69cf7e9eec35ea7a516202b2540e6710562f3