Change B

Change-Id: I08c88787d62feaf9411724d5a064421c82c80f83
Merge "Change B" into kitkat