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

Change-Id: Ibf365544a6b1dde730e41cda6f1c9b5d78481b77