Merge "Add delay before retrying write to NFCC" am: bdb53f8487
am: 5195d90184

Change-Id: Idabb67847ec0d9ab890736786b69b52185812edc