Reconcile with S2

Change-Id: Ie58d9b4843629c5aade01abceb60c74396f04c12