Merge "Add change to show Invalid card when erroneous card is inserted." am: 4bc825aecc
am: 8279494137

Change-Id: Ibd676d4d0f7b8d285c8c01769dc0686358f3a13d