fix bugs

Change-Id: I3b3c80cc3ebc7d141067e35bc9da488cf510c0a6
Merge "fix bugs"