O-mr1 OPM1.170712.001 merge c737077efb513cd18b47044c7def726822271db4 - clean

Change-Id: Ib0a36fe9700f6240c3892df125365bad878083b2