Merge "Using for loop instead of stream" into rvc-dev am: c822c127 am: 1b456f64 am: 9ca0e52b am: 78b65ca2 Change-Id: I6e97ec129fb6412d3749c2b2e8d1bf8f84c1e443