Merge of Sony 10.3.A.0.423 release

Change-Id: I5c885acecf38435ca8af96ca618e13d634e71cbe