am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev

* commit 'c24340f956c16d8594c44d45685f8a814538245b':