blue: merge of Sony 9.2.A.1.210

Change-Id: Ib4d41f52347a8b9d72239ee6025282ededf3d6f2