Merge changes from topic "resgidz"
am: a7004e5fed

Change-Id: I96946e0d0788771511e5027cf18d52684d4cce06