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

Change-Id: Ic88a31fe53781264158d8dc6201e8fde4cba1735