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

Change-Id: If567d7f8063f07e7c83dfaa5c74216237ae41a75