Merge "Correct the value of RESOURCES_UNAVAILABLE_OR_UNSPECIFIED" am: 0222c2cac1
am: d18d68b96f

Change-Id: If20f74a2f0cd5618ae56bbb9488bacd551cabacd