Merge "Add BICS apns to sample apns" am: cb33415794 am: c4376856e1
am: b6b87c60d1

Change-Id: I9209c58d63039d857c6bd530fbcc07598b7da6b3