Merge of Sony 9.1.A.1.141 Release

Change-Id: Ic373a0735d985b71268ef2ee9d94970d9d8ca51b
Merge "Merge of Sony 9.1.A.1.141 Release" into cm-10.1