Merge changes from topic "resgidz" am: a7004e5fed
am: b162da3a47

Change-Id: Iebe526ef318e7602ac55fb9822261554002df255