Also adds regression test 127-secondarydex. Bug: 18150997 (cherry picked from commit d2bee3df) Change-Id: I911dd7c92c51939504cfee5a3d18a835987b8388