Merge of Sony Release 14.1.G.1.518

Change-Id: Iaade9329f284b15442fe35b2f42c18ef14615c92
Merge of Sony Release 14.1.G.1.534

Change-Id: I1a80114b825d3e13077fa9d310e58ca4af95ee46