hand merge 43a87c5c87 and add some more fixes Change-Id: Iea608bfba37e2e4c6a3430c13f683e54b0eff64b
43a87c5c87