Merge remote-tracking branch 'origin/t6490_fp5_qssi_CS7_r31.2' into fp5-qssi-0330

Change-Id: I8bdda1ac68b4e16b231373ccab24f10a9893bb53
tree: c9ba643d99a43d8961b01deec593aab8469e61f8
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. OWNERS