Merge "Add new no-op interface method." am: 78bfc6f55f
am: 6f918104aa

Change-Id: I4c6643c124838a6dd3d69d58be358f824461a632