Update for Note 3

Change-Id: Ia34ca663028f5f4494021aa1e2ff36df4787cc55