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

Change-Id: I54d059d23ef628b338a5b406ddcf73477984e6e8