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