Merge "Merge smali upstream into master" am: 9cd7a6e0ac
am: 7fb4020b49

Change-Id: I13955458746a13893b1171afc3ce84743c8e9dc1