Change-Id: Id0a69f98297d6a827006c6c4fe1304a197381f82
9bd6dac470
The bulk merge from -bayo to klp-dev should not have been merged to master. Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854