Merge of 14.6.A.0.368 Sony release

Change-Id: I300d936cd3f286b8c0095d6aca847050a9f08dae
6 files changed