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