Merge branch 'topic/oxygen' into topic/hda