Merge changes from topic 'upgrade-smali' am: 78cf98bb8c am: e6691d470b
am: 5714be474c

Change-Id: I7d1468ab0dfbc6e5cdd980f3581c7997f3bbc1aa