Merge "DO NOT MERGE. Clarify FileObserver docs for null value." into nyc-mr1-dev
am: cdd2b6f311

Change-Id: Ia6304e9515e8e7c9bb19d17d2833a58873f1801e