Merge changes from topic 'fb-new-project' into stage-aosp-master
am: c3099c0428

Change-Id: I83d9df1877a11a408d4decc0695025108dfa130c