Merge "Merge "Replace Log.wtf by Log.e" into nyc-dev am: be2527b964 am: 031def9e8e" into nyc-mr1-dev-plus-aosp