Update felix SVN to 29 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0c650e810d598f67b21cb0f862c12c1d4fd68490) Merged-In: Ia1f09da58824a8300e364bd3236fad0685ee5508 Change-Id: Ia1f09da58824a8300e364bd3236fad0685ee5508