Merge changes from topic "118349116" am: 90f496b14c
am: 14823f0ced

Change-Id: I35bf3e4ca0b829f7bced78924036054b8c170f43