Merge changes from topic 'fb-new-project' into stage-aosp-master am: c3099c0428 am: da42c6999c
am: 5b683ac2f2
Change-Id: I53beb8793d989d7551424d33f70537b3704a6302
This commit is contained in: