RHINE: Merge of Sony release 14.4.A.0.133

Change-Id: Ifd5a5fe561778adcd2dfb5fd081bbfd2073bbcb2