Merge of Sony release 10.3.1.A.2.67

Change-Id: I55f50d8605c6a2d557e34455d66d778efdff8216
Merge branch 'cm-10.1' into phablet-saucy