Push forward to 4.2.2 : 1.3

Change-Id: If0e87a36ae08fb778e571ce8db2e12f14253aa17
Merge "Push forward to 4.2.2 : 1.3" into jb4.2