bug fix for bugs 1355006, 1354579, 1354581, 1355712, 1354579

Change-Id: Ia64a03784b39ec65ec1e5949d89c817929726751
Merge "bug fix for bugs 1355006, 1354579, 1354581, 1355712, 1354579"