Merge "Don't require BROWSABLE" into oc-dev
am: 59b9a851a7

Change-Id: I4bcbcddd76b9fa4e85a0edf223a98b8c18dd791c