Merge \\"Fix updateShortcuts() with icons\\" into nyc-mr1-dev am: bc8e0052fd
am: 2194bf522c

Change-Id: Ic8dd1a04bf651ef9fa1a969117a7a7c6fcd6089e