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

Change-Id: Id0ff02ec977e4cfa16db46d96e9aa86b9bd4bc11