Merge "Update Rail Data Collection Frequency" into qt-dev
am: 25b06f04d4

Change-Id: I6e850eab5e6511f1f8c77a378cdb335532b95376