Updating with bugfixes

Change-Id: I95550dceba63ae4b14fd9a93bf5127d4749035c0
(cherry picked from commit 5525a937aa926d8484b076bc811d3525147c3cba)