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