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

Change-Id: Ic2c7213303c32d826a55cc55092e04ddb2260ffd