Merge remote-tracking branch 'arm/master' into HEAD

Change-Id: Id58b6ebcefc6f42a2a8e585604ef44afabf4efc2