rhine: merge of Sony 4.4.2 release

Change-Id: I8801393824efa85a3844dc825dc54ef6acd488a7