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