Merge "Merge "Switching launcher icon for page fragment." into nyc-dev am: fc9a4b3f53 am: 157f34aa30" into nyc-mr1-dev-plus-aosp
am: 7f94d9f6f5

* commit '7f94d9f6f5807cb67861097c24cf3198c3093fcd':

Change-Id: I5092b7be3754b558f33086c0e08ecb077ea73d19