Merge "Add a function to allow statslog failure." am: ed673c967d
am: cc3d37c0b7

Change-Id: If9b580f4c9e3a8667d203c240c31b8bf0a997000