Merge changes from topic "oth-b123003088" am: 9d94a8566f am: 1b22ce2dfe am: aa0bcdc035
am: fcb38946a7

Change-Id: I12283bbf026423b3c42b0b1e9a2cd5256bef8199