Merge \\"Collect statistics of source build version\\" into nyc-dev am: 8872a604b9
am: 9331178a6d

Change-Id: Ie20f78fb890c1970b3b6802953f39a5e8905c61a