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

Change-Id: I9735d9bf63e9e369d70c6f759ee3b39a590c84ae