Merge "Add build rule of data stall proto" am: f9727b43cb
am: 6964f58149

Change-Id: I5151f3abf2556a53c437a7998b0a5d093e69afaf