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