Merge changes from topic "b/125900276" into oc-dev am: 783d7858 am: da165f73 am: 5eea9db9 am: 770b8508 am: 6e019dd9 Change-Id: I6b0b9e826054fff138dba4573acc61170d24ec82