Moving forward to OPR6.170623.012

 git merge --no-ff f6a78079a81a177a3edebc9980829cbf39bf6655  # a.k.a. OPR6.170623.012

BUG=65411596

Change-Id: I42894f97b9d1bbb8d73e0b85980e2a1c971cd07e