Merge of Sony release 14.1.B.1.532

Change-Id: I5ea6ae2bc73a43d751ded2d62e877fa5043a3128