9bd6dac470
The bulk merge from -bayo to klp-dev should not have been merged to master. Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
Bug: 10538430 Change-Id: I933f075c5e84b637c4d171a7dcc685f0dc8a88df
Bug: 6370846 Change-Id: Ia68284b2402e52d835040da900a51cca669add2f