There are no vendor modifications in this project. Snapping to the contents of the upstream Q branch. Change-Id: Iec9285efe6e7d3ac9d78fddf46bbd254208a2338