Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660  -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 am: 9d933d9473 am: 0b7028aca6 am: 66e2af7309 am: aa0a75665f
am: 6a2af61fa4

* commit '6a2af61fa479cea4610d7be56e76a4fd89a81ed0':