Covering commits 1c263e03 and 79d8a07d from AOM codebase Change-Id: I6400e5f99bbb2ef6584ef232d465e520230c06e0