Merge "Add current.txt HAL sections for S." am: cc7eac49b2

Change-Id: I82ba3b19d2b09e851dd6b33c924b2236f6445ca8