QS Header: post some updates to the header am: 9c74ff1218
am: cff4ef93b1

Change-Id: Ib16ff7a7324ecfed77ff1bcfe8cd9b367a8ecb76